Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: BlackSound1/Shared-Buffer-Problem-in-Java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: StartingStuff
Choose a base ref
...
head repository: BlackSound1/Shared-Buffer-Problem-in-Java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 17 commits
  • 5 files changed
  • 3 contributors

Commits on Aug 1, 2020

  1. Merge pull request #1 from BlackSound1/StartingStuff

    Implemented many methods in Producer, Consumer, Semaphore, and Main
    zFlyingPhoenix authored Aug 1, 2020
    Configuration menu
    Copy the full SHA
    9ab6a6f View commit details
    Browse the repository at this point in the history
  2. Added print statements

    BlackSound1 committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    f4b173b View commit details
    Browse the repository at this point in the history
  3. Merge pull request #2 from BlackSound1/PrintingStuff

    Added print statements
    zFlyingPhoenix authored Aug 1, 2020
    Configuration menu
    Copy the full SHA
    97e4358 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Changed the run() methods to have the random number generation and ch…

    …ecks against q in them, instead of in main. Small organization and code changes. Made wait() method sleep to simulate busy-waiting. Experimented with changing buffer to queue, but queues don't have default size option. Still need to figure out how to simulate FIFO activity in buffer
    BlackSound1 committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    cf9b7e8 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. removed 'final' modifier from Semaphores. Dont know why IntelliJ want…

    …ed them. Removed Thread.sleep(). Now program has deadlock!
    BlackSound1 committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    efb9f47 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. Configuration menu
    Copy the full SHA
    3dab158 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3 from BlackSound1/Testing

    Testing main logic changes
    zFlyingPhoenix authored Aug 6, 2020
    Configuration menu
    Copy the full SHA
    841f971 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    00f10d6 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #4 from BlackSound1/revert-3-Testing

    Revert "Testing main logic changes"
    BlackSound1 authored Aug 6, 2020
    Configuration menu
    Copy the full SHA
    193c51c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fcbea90 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'master' into Testing

    # Conflicts:
    #	src/Consumer.java
    #	src/Producer.java
    BlackSound1 committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    599d83b View commit details
    Browse the repository at this point in the history
  7. Merge pull request #5 from BlackSound1/Testing

    changed logic in consume method. Added waiting text
    BlackSound1 authored Aug 6, 2020
    Configuration menu
    Copy the full SHA
    857f666 View commit details
    Browse the repository at this point in the history
  8. Adding comments prior to changing the value of mutex and after to bot…

    …h the consumer and producer class. The issue seems to stem from the fact that the attributes are not communicating with one another.
    zFlyingPhoenix committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    8c667ce View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. Added volatile keyword to Semaphore value. Everything works now! Adde…

    …d comments and edited output text for readability.
    BlackSound1 committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    1771942 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d85ae99 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Update README.md

    Updated README
    BlackSound1 authored Apr 23, 2021
    Configuration menu
    Copy the full SHA
    b830b8d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #7 from BlackSound1/BlackSound1-patch-1

    Update README.md
    BlackSound1 authored Apr 23, 2021
    Configuration menu
    Copy the full SHA
    692b669 View commit details
    Browse the repository at this point in the history
Loading